(8/8) 201 - merge fix for Java8/Mac OS 10.10 (patch #539, bug #3893)

revisions to merge: [r23720], [r23721].

Maybe wait a few days to confirm that it's fixed...